Intern type names before registering the type to avoid unnecessary copies.

2005-08-31  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_type):
	* gdk/x11/gdkscreen-x11.c (_gdk_screen_x11_get_type):
	* gdk/x11/gdkpixmap-x11.c (gdk_pixmap_impl_x11_get_type):
	* gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_get_type):
	* gdk/x11/gdkinput.c (gdk_device_get_type):
	* gdk/x11/gdkimage-x11.c (gdk_image_get_type):
	* gdk/x11/gdkgc-x11.c (_gdk_gc_x11_get_type):
	* gdk/x11/gdkdrawable-x11.c (_gdk_drawable_impl_x11_get_type):
	* gdk/x11/gdkdnd-x11.c (gdk_drag_context_get_type):
	* gdk/x11/gdkdisplay-x11.c (_gdk_display_x11_get_type):
	* gdk/x11/gdkcolor-x11.c (gdk_colormap_get_type):
	* gdk/gdkwindow.c (gdk_window_object_get_type):
	* gdk/gdkscreen.c (gdk_screen_get_type):
	* gdk/gdkrectangle.c (gdk_rectangle_get_type):
	* gdk/gdkpixmap.c (gdk_pixmap_get_type):
	* gdk/gdkkeys.c (gdk_keymap_get_type):
	* gdk/gdkfont.c (gdk_font_get_type):
	* gdk/gdkevents.c (gdk_event_get_type):
	* gdk/gdkdraw.c (gdk_drawable_get_type):
	* gdk/gdkdisplaymanager.c (gdk_display_manager_get_type):
	* gdk/gdkdisplay.c (gdk_display_get_type):
	* gdk/gdkcursor.c (gdk_cursor_get_type):
	* gdk/gdkcolor.c (gdk_color_get_type): Intern type names before
	registering the type to avoid unnecessary copies.

diff --git a/ChangeLog b/ChangeLog
index 9840704066c92de6dc714ce2fd0f68054a526351..fbf0b34182f1cc22200eb224d1ab3fae384f38f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2005-08-31  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_type): 
+       * gdk/x11/gdkscreen-x11.c (_gdk_screen_x11_get_type): 
+       * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_impl_x11_get_type): 
+       * gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_get_type): 
+       * gdk/x11/gdkinput.c (gdk_device_get_type): 
+       * gdk/x11/gdkimage-x11.c (gdk_image_get_type): 
+       * gdk/x11/gdkgc-x11.c (_gdk_gc_x11_get_type): 
+       * gdk/x11/gdkdrawable-x11.c (_gdk_drawable_impl_x11_get_type): 
+       * gdk/x11/gdkdnd-x11.c (gdk_drag_context_get_type): 
+       * gdk/x11/gdkdisplay-x11.c (_gdk_display_x11_get_type): 
+       * gdk/x11/gdkcolor-x11.c (gdk_colormap_get_type): 
+       * gdk/gdkwindow.c (gdk_window_object_get_type): 
+       * gdk/gdkscreen.c (gdk_screen_get_type): 
+       * gdk/gdkrectangle.c (gdk_rectangle_get_type): 
+       * gdk/gdkpixmap.c (gdk_pixmap_get_type): 
+       * gdk/gdkkeys.c (gdk_keymap_get_type): 
+       * gdk/gdkfont.c (gdk_font_get_type): 
+       * gdk/gdkevents.c (gdk_event_get_type): 
+       * gdk/gdkdraw.c (gdk_drawable_get_type): 
+       * gdk/gdkdisplaymanager.c (gdk_display_manager_get_type): 
+       * gdk/gdkdisplay.c (gdk_display_get_type): 
+       * gdk/gdkcursor.c (gdk_cursor_get_type): 
+       * gdk/gdkcolor.c (gdk_color_get_type): Intern type names before
+       registering the type to avoid unnecessary copies.
+
+       * configure.in: Require GLib 2.9.0
+
 2005-08-31  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolbar.c: Undeprecate gtk_toolbar_set_icon_size(),

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9840704066c92de6dc714ce2fd0f68054a526351..fbf0b34182f1cc22200eb224d1ab3fae384f38f9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,32 @@
+2005-08-31  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_type): 
+       * gdk/x11/gdkscreen-x11.c (_gdk_screen_x11_get_type): 
+       * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_impl_x11_get_type): 
+       * gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_get_type): 
+       * gdk/x11/gdkinput.c (gdk_device_get_type): 
+       * gdk/x11/gdkimage-x11.c (gdk_image_get_type): 
+       * gdk/x11/gdkgc-x11.c (_gdk_gc_x11_get_type): 
+       * gdk/x11/gdkdrawable-x11.c (_gdk_drawable_impl_x11_get_type): 
+       * gdk/x11/gdkdnd-x11.c (gdk_drag_context_get_type): 
+       * gdk/x11/gdkdisplay-x11.c (_gdk_display_x11_get_type): 
+       * gdk/x11/gdkcolor-x11.c (gdk_colormap_get_type): 
+       * gdk/gdkwindow.c (gdk_window_object_get_type): 
+       * gdk/gdkscreen.c (gdk_screen_get_type): 
+       * gdk/gdkrectangle.c (gdk_rectangle_get_type): 
+       * gdk/gdkpixmap.c (gdk_pixmap_get_type): 
+       * gdk/gdkkeys.c (gdk_keymap_get_type): 
+       * gdk/gdkfont.c (gdk_font_get_type): 
+       * gdk/gdkevents.c (gdk_event_get_type): 
+       * gdk/gdkdraw.c (gdk_drawable_get_type): 
+       * gdk/gdkdisplaymanager.c (gdk_display_manager_get_type): 
+       * gdk/gdkdisplay.c (gdk_display_get_type): 
+       * gdk/gdkcursor.c (gdk_cursor_get_type): 
+       * gdk/gdkcolor.c (gdk_color_get_type): Intern type names before
+       registering the type to avoid unnecessary copies.
+
+       * configure.in: Require GLib 2.9.0
+
 2005-08-31  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolbar.c: Undeprecate gtk_toolbar_set_icon_size(),

diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index d2a4a55cabb415f018e0c4365062bdf7c9257515..25b600ea294be1c79faaf4046ce437749fd3c790 100644 (file)
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -314,7 +314,7 @@ gdk_color_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GdkColor",
+    our_type = g_boxed_type_register_static (g_intern_static_string ("GdkColor"),
                                             (GBoxedCopyFunc)gdk_color_copy,
                                             (GBoxedFreeFunc)gdk_color_free);
   return our_type;

diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index 1038d7347991856a8415ac5b362346acf85cce71..23cb9525769e7a4d614ce2994af2c96d108e3808 100644 (file)
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -36,7 +36,7 @@ gdk_cursor_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GdkCursor",
+    our_type = g_boxed_type_register_static (g_intern_static_string ("GdkCursor"),
                                             (GBoxedCopyFunc)gdk_cursor_ref,
                                             (GBoxedFreeFunc)gdk_cursor_unref);
   return our_type;

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 463c98e9f225de7b3fa195e602e825966fb42724..986fcdf25db330879cce740578553c401cb860ca 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -107,7 +107,7 @@ gdk_display_get_type (void)
        (GInstanceInitFunc) gdk_display_init
       };
       object_type = g_type_register_static (G_TYPE_OBJECT,
-                                           "GdkDisplay", &object_info, 0);
+                                           g_intern_static_string ("GdkDisplay"), &object_info, 0);
     }
 
   return object_type;

diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 157bcf42c4171ff66add4583c48b96e3cbaf5548..ca603624ea342b4492cb4ac41e4994bfacfa8a47 100644 (file)
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -88,7 +88,7 @@ gdk_display_manager_get_type (void)
       };
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "GdkDisplayManager",
+                                            g_intern_static_string ("GdkDisplayManager"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index 116b02965aa3b9d703362aab990f44f665fea2c3..024215e57146f050a0f7f57c29e96fef6e50124d 100644 (file)
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -85,7 +85,7 @@ gdk_drawable_get_type (void)
       };
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "GdkDrawable",
+                                            g_intern_static_string ("GdkDrawable"),
                                             &object_info, 
                                            G_TYPE_FLAG_ABSTRACT);
     }  

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index bcafbde95645d9c0036b88f0757419631e1b336b..040ebc292f4041dc5228dfe1ca7e3f4420ff3f69 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -1200,7 +1200,7 @@ gdk_event_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GdkEvent",
+    our_type = g_boxed_type_register_static (g_intern_static_string ("GdkEvent"),
                                             (GBoxedCopyFunc)gdk_event_copy,
                                             (GBoxedFreeFunc)gdk_event_free);
   return our_type;

diff --git a/gdk/gdkfont.c b/gdk/gdkfont.c
index dd90c975d89050fc13582981748241955b570a82..f549cbdce4bd0aa7de351702ee5e1fab1de1a4c1 100644 (file)
--- a/gdk/gdkfont.c
+++ b/gdk/gdkfont.c
@@ -38,7 +38,7 @@ gdk_font_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GdkFont",
+    our_type = g_boxed_type_register_static (g_intern_static_string ("GdkFont"),
                                             (GBoxedCopyFunc)gdk_font_ref,
                                             (GBoxedFreeFunc)gdk_font_unref);
   return our_type;

diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index 754dee38c20c9128fdc9c80d7b0ea94b8af35f2a..cc48623e82ad0bb665f5342e4f09088be25130bb 100644 (file)
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -61,7 +61,7 @@ gdk_keymap_get_type (void)
       };
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "GdkKeymap",
+                                            g_intern_static_string ("GdkKeymap"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c
index 06021e60c880f4e0065f6a70dc1d199c7afc2e3e..9c2d1100f3b0a91ace392abfe3a07fc17a9348bb 100644 (file)
--- a/gdk/gdkpixmap.c
+++ b/gdk/gdkpixmap.c
@@ -180,7 +180,7 @@ gdk_pixmap_get_type (void)
       };
       
       object_type = g_type_register_static (GDK_TYPE_DRAWABLE,
-                                            "GdkPixmap",
+                                            g_intern_static_string ("GdkPixmap"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index d79bdf6b1e01c898dc1ed9c6a13e7fd082dea663..649521a32ca0f70e9b1518901d3618b9db93a4fb 100644 (file)
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -99,7 +99,7 @@ gdk_rectangle_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GdkRectangle",
+    our_type = g_boxed_type_register_static (g_intern_static_string ("GdkRectangle"),
                                             (GBoxedCopyFunc)gdk_rectangle_copy,
                                             (GBoxedFreeFunc)g_free);
   return our_type;

diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index 949a9d22ea612746cbf303e1348de325af5067c6..94c4f96eb72cfe3597e7d52deea2c05149860856 100644 (file)
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -80,7 +80,7 @@ gdk_screen_get_type (void)
        };
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
-                                           "GdkScreen", &object_info, 0);
+                                           g_intern_static_string ("GdkScreen"), &object_info, 0);
     }
 
   return object_type;

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 999d4192cd608b88592b849dea2f101e0a463239..186d85d928d9fceaec9dd7e682e5aab43ef9823d 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -215,7 +215,7 @@ gdk_window_object_get_type (void)
       };
       
       object_type = g_type_register_static (GDK_TYPE_DRAWABLE,
-                                            "GdkWindow",
+                                            g_intern_static_string ("GdkWindow"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index 95fffe82b7d6c8e6a578ebf433cb6fa943c3d75a..35dcb6fdf8de82a3ebd637ebf0cc47b2932e97c5 100644 (file)
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -93,7 +93,7 @@ gdk_colormap_get_type (void)
       };
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "GdkColormap",
+                                            g_intern_static_string ("GdkColormap"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 133909dd2f769308968e60e51ce49b758e08117e..80cafbf13503153a426b5224b86fe3faa7721e32 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -115,7 +115,7 @@ _gdk_display_x11_get_type (void)
        };
       
       object_type = g_type_register_static (GDK_TYPE_DISPLAY,
-                                           "GdkDisplayX11",
+                                           g_intern_static_string ("GdkDisplayX11"),
                                            &object_info, 0);
     }
   

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 41598615b27030934f10f32f4efcf9e64e0620cb..15e66e18c344390531540aebb346b00297286fcf 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -166,7 +166,7 @@ gdk_drag_context_get_type (void)
       };
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "GdkDragContext",
+                                            g_intern_static_string ("GdkDragContext"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 49ab08f61ff9e4f6a31af3e9a81c9dc9c634ddc4..ff0441b29ecf6ebd96ffc517d3057ec64d6eaf2d 100644 (file)
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -167,7 +167,7 @@ _gdk_drawable_impl_x11_get_type (void)
       };
       
       object_type = g_type_register_static (GDK_TYPE_DRAWABLE,
-                                            "GdkDrawableImplX11",
+                                            g_intern_static_string ("GdkDrawableImplX11"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c
index 2d0fe34a7b39eb862961a590f998b3012df130ee..308a31cbdf58f2474bb0ed4ec09bf8d78859f5d3 100644 (file)
--- a/gdk/x11/gdkgc-x11.c
+++ b/gdk/x11/gdkgc-x11.c
@@ -80,7 +80,7 @@ _gdk_gc_x11_get_type (void)
       };
       
       object_type = g_type_register_static (GDK_TYPE_GC,
-                                            "GdkGCX11",
+                                            g_intern_static_string ("GdkGCX11"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index d6ca243395847960ed4a56da545c560a1fe7ef0c..4b836e5679ac7b690afd54ff91467eb7212101db 100644 (file)
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -97,7 +97,7 @@ gdk_image_get_type (void)
       };
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "GdkImage",
+                                            g_intern_static_string ("GdkImage"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index f1c7f7364759d3171f2a35171caf1a7653751af0..574e701d69fdde7eb41059d9b545205909c36f74 100644 (file)
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -84,7 +84,7 @@ gdk_device_get_type (void)
       };
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "GdkDevice",
+                                            g_intern_static_string ("GdkDevice"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 42e5b4a64ab4acd3b330386cf0d258d0845357de..6539e79fffc8c6f8b2d16d693c7dc6d1bb1d12da 100644 (file)
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -126,7 +126,7 @@ gdk_keymap_x11_get_type (void)
        };
       
       object_type = g_type_register_static (GDK_TYPE_KEYMAP,
-                                            "GdkKeymapX11",
+                                            g_intern_static_string ("GdkKeymapX11"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index 540d9ac30b69a28fea652f7f74c7d3bdd7008aab..0fdf895eb82ecdbb9624197be907747577a71435 100644 (file)
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -87,7 +87,7 @@ gdk_pixmap_impl_x11_get_type (void)
       };
       
       object_type = g_type_register_static (GDK_TYPE_DRAWABLE_IMPL_X11,
-                                            "GdkPixmapImplX11",
+                                            g_intern_static_string ("GdkPixmapImplX11"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 1dbff67c2ee0e19186ac7958149e048e9ccdfcff..7f2a2a5a38506e032ee30633c50c0095d79e8215 100644 (file)
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -80,7 +80,7 @@ _gdk_screen_x11_get_type (void)
          (GInstanceInitFunc) NULL,
        };
       object_type = g_type_register_static (GDK_TYPE_SCREEN,
-                                           "GdkScreenX11",
+                                           g_intern_static_string ("GdkScreenX11"),
                                            &object_info, 0);
     }
   return object_type;

diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index b7964079865f3c4b163904e3ba86578a9db79351..fc10ab1233dd3cdb2c745732f652e540d63fb246 100644 (file)
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -97,7 +97,7 @@ gdk_visual_get_type (void)
       };
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "GdkVisual",
+                                            g_intern_static_string ("GdkVisual"),
                                             &object_info, 0);
     }
   

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 5d2f5bc02b557fb8d94a1d1de8000ae2dfe280d7..3ef562f7e75e23ff3d5dd89cfd6b423ceb530cc8 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -136,7 +136,7 @@ gdk_window_impl_x11_get_type (void)
       };
       
       object_type = g_type_register_static (GDK_TYPE_DRAWABLE_IMPL_X11,
-                                            "GdkWindowImplX11",
+                                            g_intern_static_string ("GdkWindowImplX11"),
                                             &object_info, 0);
     }